bitkeeper revision 1.1159.1.472 (41ab49ab0UJYMrnMqSqKOFhhX2ypGw)
authorcl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Mon, 29 Nov 2004 16:09:15 +0000 (16:09 +0000)
committercl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Mon, 29 Nov 2004 16:09:15 +0000 (16:09 +0000)
commit9ed09c1506f966452b047aeb94574a9eda071f58
treec8d0b19e163d2cfe1b89cf7262bf41105f2debe1
parent7661a72b3cc59ffacb7ad72ee9fbeac6bf9a50d3
parent6800d1643a9a16653a4b499b69bf1c39aea9e8b7
bitkeeper revision 1.1159.1.472 (41ab49ab0UJYMrnMqSqKOFhhX2ypGw)

Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xen.bk-smp
.rootkeys
linux-2.6.9-xen-sparse/arch/xen/i386/Kconfig
linux-2.6.9-xen-sparse/arch/xen/i386/kernel/setup.c
linux-2.6.9-xen-sparse/drivers/xen/blkfront/blkfront.c
xen/arch/x86/dom0_ops.c
xen/include/asm-x86/processor.h
xen/include/public/dom0_ops.h